Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 10:24:14 +0000 (10:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 12 Jun 2010 10:24:14 +0000 (10:24 +0000)
commit7f5528616c1445cae18b2236f7215e905901ba58
tree70d6a978d0c33cef7a2b8b1d0387a70f386e63d4
parent8c166926ac0daabb58fcc518c116c902d86ac76e
parent0cabcc9ecfdb203d52cdc0a121f4e92c634aa0d4
Merge from mainline.